Merge branch 'hotfix/1.5.24' v1.5.24
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 17:59:35 +0000 (13:59 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 17:59:35 +0000 (13:59 -0400)

Trivial merge