Merge tag 'v1.5.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Feb 2016 19:45:42 +0000 (14:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Feb 2016 19:45:42 +0000 (14:45 -0500)
Version 1.5.2


Trivial merge