Merge tag 'v1.5.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 18:32:25 +0000 (14:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 18:32:25 +0000 (14:32 -0400)
Version 1.5.2


Trivial merge