Merge branch 'release/1.0.21' v1.0.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 17:15:52 +0000 (13:15 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 17:15:52 +0000 (13:15 -0400)

Trivial merge