Sync auto-generated file.
Merge pull request #1 from gallonp/remotes/origin/m6-new

M6 demo'd, merge with master