Merge pull request #428 from TheBlueMatt/2019-12-flat-features