Added master flag for separate master/peer builds
Merge remote-tracking branch 'origin/master'