Merge commit 'b9cd4b69f46a3f50649e9b3f1790837ca85fcc6e'
Merge branch 'github/master'
Changed default.xml to get the master branch, not the develop.