Merge branch 'release/1.0.21' v1.0.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 10 Nov 2017 20:59:27 +0000 (15:59 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 10 Nov 2017 20:59:27 +0000 (15:59 -0500)

Trivial merge