Merge tag 'v1.5.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 17:31:42 +0000 (12:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 17:31:42 +0000 (12:31 -0500)
Version 1.5.2


Trivial merge