Merge tag 'v1.0.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 2 Aug 2016 14:47:11 +0000 (10:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 2 Aug 2016 14:47:11 +0000 (10:47 -0400)
v1.0.21


Trivial merge