Merge branch 'release/1.2.4' v1.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Oct 2015 15:27:32 +0000 (11:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Oct 2015 15:27:32 +0000 (11:27 -0400)

Trivial merge