Merge branch 'hotfix/1.5.9' v1.5.9
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 20:39:06 +0000 (15:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 20:39:06 +0000 (15:39 -0500)

Trivial merge