Merge tag 'v1.0.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Aug 2017 13:01:27 +0000 (09:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Aug 2017 13:01:27 +0000 (09:01 -0400)
v1.0.21


Trivial merge