Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 17 Jul 2017 12:20:02 +0000 (08:20 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 17 Jul 2017 12:20:02 +0000 (08:20 -0400)

Trivial merge