Temporary Twitter fix.
Merge branch 'dev'