Merge branch 'hotfix/1.1.18' v1.1.18
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 18:27:47 +0000 (13:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Dec 2017 18:27:47 +0000 (13:27 -0500)

Trivial merge