Merge tag 'v1.5.24' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:00:04 +0000 (14:00 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 18:00:04 +0000 (14:00 -0400)
version 1.5.24


Trivial merge