Merge branch 'nerdstrike-master'
John Napiorkowski [Tue, 23 Sep 2014 16:45:40 +0000 (11:45 -0500)]

Trivial merge