making master branch go-getable
Merge branch 'master' into mw_master
Revert "making master branch go-getable"

This reverts commit b7fc6ff9086def477127348f84e61b2a3f6f6a7b.