Merge branch 'cryptomail-master'
John Napiorkowski [Mon, 27 Jul 2015 14:20:26 +0000 (09:20 -0500)]

Trivial merge