Initial backport to 1.6.4
Finished build script
Merge pull request #1 from K-4U/1.6.4

Backported to 1.6.4