Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
authorjpope777 <jpope@jpope.org>
Mon, 6 Jan 2014 21:20:53 +0000 (15:20 -0600)
committerjpope777 <jpope@jpope.org>
Mon, 6 Jan 2014 21:20:53 +0000 (15:20 -0600)

Trivial merge