Merge branch 'hotfix/1.0.47' v1.0.47
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 7 Dec 2015 01:07:41 +0000 (20:07 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 7 Dec 2015 01:07:41 +0000 (20:07 -0500)

Trivial merge