Make master the working copy for integrating BS 3.1