Merge branch 'zetetic-prerelease' into zetetic-master