Merge "Ability to build from different Style folders" into devel/master