Reset master branch following merge from dev