Merge branch 'hotfix/1.4.2' v1.4.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 18:56:38 +0000 (14:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Jun 2015 18:56:38 +0000 (14:56 -0400)

Trivial merge