Merge branch 'release/1.5.2' v1.5.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Feb 2016 19:45:35 +0000 (14:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Feb 2016 19:45:35 +0000 (14:45 -0500)

Trivial merge