Merge branch 'hotfix/1.5.7' v1.5.7
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Feb 2017 20:19:04 +0000 (15:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Feb 2017 20:19:04 +0000 (15:19 -0500)

Trivial merge