Merge branch 'release/1.2.4' v1.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 18:39:53 +0000 (14:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 18:39:53 +0000 (14:39 -0400)

Trivial merge