Merge branch 'hotfix/2.1.18' v2.1.18
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 13:31:35 +0000 (09:31 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 13:31:35 +0000 (09:31 -0400)

Trivial merge