Merge branch 'hotfix/1.2.4' v1.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Nov 2015 20:06:40 +0000 (15:06 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Nov 2015 20:06:40 +0000 (15:06 -0500)

Trivial merge