Merge branch 'tmgstevens-twitter' into trunk