Merge branch 'hotfix/1.1.21' v1.1.21
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Dec 2017 22:00:25 +0000 (17:00 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Dec 2017 22:00:25 +0000 (17:00 -0500)

Trivial merge