Merge branch 'hotfix/2.1.10' v2.1.10
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 12:53:43 +0000 (08:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 12:53:43 +0000 (08:53 -0400)

Trivial merge