Merge branch 'release/1.4.2' v1.4.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 18:58:21 +0000 (14:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 18:58:21 +0000 (14:58 -0400)

Trivial merge