Merge branch 'hotfix/1.0.49' v1.0.49
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 15 Dec 2015 15:47:37 +0000 (10:47 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 15 Dec 2015 15:47:37 +0000 (10:47 -0500)

Trivial merge