Merge branch 'hotfix/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:08:34 +0000 (14:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:08:34 +0000 (14:08 -0400)

Trivial merge