1.6.4 recommended build
Merge branch 'master' of https://github.com/daggs/BuildFixes