Build system up to date
Merge branch 'master' into 1.6.2-working