Merge branch 'hotfix/1.5.8' v1.5.8
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Apr 2017 17:50:10 +0000 (13:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Apr 2017 17:50:10 +0000 (13:50 -0400)

Trivial merge