Fix merge conflicts for develop->master