Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
authorjpope777 <jpope@jpope.org>
Tue, 7 Jan 2014 07:06:09 +0000 (01:06 -0600)
committerjpope777 <jpope@jpope.org>
Tue, 7 Jan 2014 07:06:09 +0000 (01:06 -0600)

Trivial merge