Changes for the new build server
Merge branch 'master' of https://github.com/Daenks/Meridian59_103