Merge branch 'hotfix/1.2.4' v1.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 17:32:07 +0000 (13:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 17:32:07 +0000 (13:32 -0400)

Trivial merge