Merge branch 'release/1.4.1' v1.4.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:35:20 +0000 (14:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:35:20 +0000 (14:35 -0500)

Trivial merge