Merge branch 'hotfix/1.5.2' v1.5.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 18:32:19 +0000 (14:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 18:32:19 +0000 (14:32 -0400)

Trivial merge