Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'