Merge branch 'hotfix/1.0.50' v1.0.50
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 15 Dec 2015 15:58:25 +0000 (10:58 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 15 Dec 2015 15:58:25 +0000 (10:58 -0500)

Trivial merge