Merge branch 'release/1.1.21' v1.1.21
authorLaury GvR <laury@gaslightmedia.com>
Tue, 18 Jul 2017 19:43:05 +0000 (15:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 18 Jul 2017 19:43:05 +0000 (15:43 -0400)

Trivial merge