Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop'