Merge branch 'davewood-master'
John Napiorkowski [Tue, 30 Dec 2014 22:44:56 +0000 (16:44 -0600)]

Trivial merge