Merge branch 'hotfix/1.1.17' v1.1.17
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 18:15:08 +0000 (14:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 18:15:08 +0000 (14:15 -0400)

Trivial merge