Merge branch 'hotfix/1.1.18' v1.1.18
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:36:57 +0000 (11:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:36:57 +0000 (11:36 -0400)

Trivial merge