Merge branch 'hotfix/1.0.24' v/1.0.24
authorIan Weller <ian@gaslightmedia.com>
Tue, 15 Mar 2016 13:00:47 +0000 (09:00 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 15 Mar 2016 13:00:47 +0000 (09:00 -0400)

Trivial merge