Merge the 'develop' branch into 'master'