Problem: Project structure out-of-date with latest zproject
Solution: Regenerate with latest zproject
Merge pull request #283 from jemc/master

Problem: Project structure out-of-date with latest zproject