Merge branch 'hotfix/1.5.2' v1.5.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 17:31:32 +0000 (12:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 17:31:32 +0000 (12:31 -0500)

Trivial merge