Merge branch 'release/1.4.0' v1.4.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Nov 2015 15:39:50 +0000 (10:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Nov 2015 15:39:50 +0000 (10:39 -0500)

Trivial merge