Merge branch 'hotfix/1.0.20' v1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:58:16 +0000 (10:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:58:16 +0000 (10:58 -0400)

Trivial merge