Merge branch 'hotfix/1.0.58' v1.0.58
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 10 Feb 2016 19:00:44 +0000 (14:00 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 10 Feb 2016 19:00:44 +0000 (14:00 -0500)

Trivial merge