Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Jan 2018 19:31:00 +0000 (14:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Jan 2018 19:31:00 +0000 (14:31 -0500)

Trivial merge