Merge branch 'hotfix/1.0.20' v1.0.20
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 15:45:33 +0000 (11:45 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 15:45:33 +0000 (11:45 -0400)

Trivial merge