Merge branch 'hotfix/1.1.7' master
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 19:20:57 +0000 (15:20 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 19:20:57 +0000 (15:20 -0400)

Trivial merge