Merge branch 'hotfix/1.0.58'
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 10 Feb 2016 18:58:35 +0000 (13:58 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 10 Feb 2016 18:58:35 +0000 (13:58 -0500)

Trivial merge