Merge branch 'hotfix/1.5.7' v1.5.7
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 18 Nov 2016 17:56:08 +0000 (12:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 18 Nov 2016 17:56:08 +0000 (12:56 -0500)

Trivial merge