Merge branch 'hotfix/1.1.7' v1.1.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Sep 2016 12:10:34 +0000 (08:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Sep 2016 12:10:34 +0000 (08:10 -0400)

Trivial merge