Merge branch 'hotfix/1.0.53' v1.0.53
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Dec 2015 21:43:35 +0000 (16:43 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Dec 2015 21:43:35 +0000 (16:43 -0500)

Trivial merge