Merge branch 'hotfix/1.0.20' v1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:01:25 +0000 (13:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:01:25 +0000 (13:01 -0400)

Trivial merge