Prepared for crash reporter.
Merge remote-tracking branch 'origin/20140401-dev-stable' into feature-20140521-push-messaging