Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 10 Nov 2017 15:39:48 +0000 (10:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 10 Nov 2017 15:39:48 +0000 (10:39 -0500)

Trivial merge