Merge tag 'v1.1.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 30 Apr 2018 16:05:56 +0000 (12:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 30 Apr 2018 16:05:56 +0000 (12:05 -0400)
v1.1.21


Trivial merge