Merge remote-tracking branch 'origin/feature-20140730-is-composing' into feature-20140521-push-messaging