Clean master for merging with develop