Squashed 'core/' changes from 535c35e..363110f

363110f Try gradle property instead of system property

git-subtree-dir: core
git-subtree-split: 363110fa014c07006e5a427dcf418fc921c43bbe
Merge commit 'f2720f33812ddbb1f809fa9efb2f05026a635ce6' into develop
Try gradle properties instead of system properties (travis didn't like it)