Merge tag 'v1.1.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 18 Jul 2017 19:43:09 +0000 (15:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 18 Jul 2017 19:43:09 +0000 (15:43 -0400)
v1.1.21


Trivial merge