Merge branch 'release/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Tue, 2 Aug 2016 14:47:08 +0000 (10:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 2 Aug 2016 14:47:08 +0000 (10:47 -0400)

Trivial merge