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

Trivial merge