Merge branch 'release/1.2.20' V1.2.20
authorLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 12:53:21 +0000 (08:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 12:53:21 +0000 (08:53 -0400)

Trivial merge