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

Trivial merge