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

Trivial merge