Merge branch 'hotfix/2.0.10' v2.0.10
authorLaury GvR <laury@gaslightmedia.com>
Fri, 3 Jun 2016 17:35:58 +0000 (13:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 3 Jun 2016 17:35:58 +0000 (13:35 -0400)

Trivial merge