Merge branch 'hotfix/v1.2.4' v1.2.4
authorIan Weller <ian@gaslightmedia.com>
Thu, 13 Aug 2015 19:44:59 +0000 (15:44 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 13 Aug 2015 19:44:59 +0000 (15:44 -0400)

Trivial merge