Merge branch 'hotfix/1.1.21' v1.1.21
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Jan 2018 12:42:30 +0000 (07:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 17 Jan 2018 12:42:30 +0000 (07:42 -0500)

Trivial merge