Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
authorjpope777 <jpope@jpope.org>
Wed, 8 Jan 2014 02:40:12 +0000 (20:40 -0600)
committerjpope777 <jpope@jpope.org>
Wed, 8 Jan 2014 02:40:12 +0000 (20:40 -0600)

Trivial merge