Merge branch 'hotfix/1.0.21' v1.0.21
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Oct 2017 16:59:50 +0000 (12:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Oct 2017 16:59:50 +0000 (12:59 -0400)

Trivial merge