prepare master branch for a new diablo branch