Merge branch 'hotfix/1.5.9' v1.5.9
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Mar 2017 20:06:31 +0000 (16:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Mar 2017 20:06:31 +0000 (16:06 -0400)

Trivial merge