Merge branch 'hotfix/1.1.4' v1.1.4
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 16:25:22 +0000 (12:25 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 10 Oct 2016 16:25:22 +0000 (12:25 -0400)

Trivial merge