Merge branch 'hotfix/2.9.18' v2.9.18
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 12 Jun 2017 16:36:32 +0000 (12:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 12 Jun 2017 16:36:32 +0000 (12:36 -0400)

Trivial merge