Merge branch 'valy23-patch-1'
John Napiorkowski [Wed, 1 Oct 2014 21:35:29 +0000 (16:35 -0500)]

Trivial merge