Merge branch 'hotfix/1.4.2' v1.4.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:41:55 +0000 (14:41 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:41:55 +0000 (14:41 -0500)

Trivial merge