Merge branch 'hotfix/1.5.8' v1.5.8
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 8 Mar 2017 18:51:48 +0000 (13:51 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 8 Mar 2017 18:51:48 +0000 (13:51 -0500)

Trivial merge