build.properties should override
Merge branch 'master' into 2.x