Merge branch 'hotfix/1.1.19' v1.1.19
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 18:45:11 +0000 (13:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 18:45:11 +0000 (13:45 -0500)

Trivial merge