Merge branch 'hotfix/1.5.18' v1.5.18
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Apr 2016 20:49:34 +0000 (16:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Apr 2016 20:49:34 +0000 (16:49 -0400)

Trivial merge