Merge branch 'revmischa-master'
John Napiorkowski [Mon, 27 Jul 2015 14:22:31 +0000 (09:22 -0500)]

Trivial merge