Merge branch 'maqnouch-patch-1' into orpington
John Napiorkowski [Wed, 22 Jul 2015 17:15:35 +0000 (12:15 -0500)]

Trivial merge