Merge branch 'develop' into remove-twitter-api