Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'