Merge branch 'release/1.4.0' v1.4.0
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 15:12:00 +0000 (11:12 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 15:12:00 +0000 (11:12 -0400)

Trivial merge