Merge branch 'release/1.0.48' v1.0.48
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 19:34:06 +0000 (14:34 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 19:34:06 +0000 (14:34 -0500)

Trivial merge