Merge branch 'simbabque-contributing-with-git'
John Napiorkowski [Fri, 24 Jul 2015 19:40:51 +0000 (14:40 -0500)]

Trivial merge