Merge branch 'hotfix/1.1.19' v1.1.19
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 19:32:19 +0000 (15:32 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 19:32:19 +0000 (15:32 -0400)

Trivial merge