Merge branch 'so-long-twitterapi' into 'develop'