Merge branch 'hotfix/1.4.1' v1.4.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 16:05:57 +0000 (12:05 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 16:05:57 +0000 (12:05 -0400)

Trivial merge