Eclipse: Add project.properties
Merge branch 'master' into eclipse
Test