Merge tag 'v1.0.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:08:41 +0000 (14:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:08:41 +0000 (14:08 -0400)
v1.0.21


Trivial merge