Merge branch 'release/1.0.20' v1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Tue, 6 Jun 2017 19:47:41 +0000 (15:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 6 Jun 2017 19:47:41 +0000 (15:47 -0400)

Trivial merge