Merge tag 'V1.2.20' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 12:53:25 +0000 (08:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 12:53:25 +0000 (08:53 -0400)
v1.2.20


Trivial merge