Some output files changed
Merge branch 'master' into officialTag