Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
authorjpope777 <jpope@jpope.org>
Sat, 11 Jan 2014 06:26:28 +0000 (00:26 -0600)
committerjpope777 <jpope@jpope.org>
Sat, 11 Jan 2014 06:26:28 +0000 (00:26 -0600)

Trivial merge