Merge branch 'bump-mastofe-2018-09-20' into 'develop'