Merge pull request #750 from lovmoen/master

Moved zclass packaging to non-generated files.
Merge remote-tracking branch 'upstream/master'