Merge branch 'hotfix/1.5.7' v1.5.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 15:10:50 +0000 (10:10 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 15:10:50 +0000 (10:10 -0500)

Trivial merge