Build.properties MUST NOT contain an output!
Merge remote-tracking branch 'origin/alex' into roland