Merge branch 'hotfix/1.0.20'
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 12:54:48 +0000 (08:54 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 14 Jul 2016 12:54:48 +0000 (08:54 -0400)

Trivial merge