Merge branch 'hotfix/1.5.9' v1.5.9
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 May 2017 14:18:25 +0000 (10:18 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 May 2017 14:18:25 +0000 (10:18 -0400)

Trivial merge