Merge branch 'hotfix/2.0.11' v2.0.11
authorLaury GvR <laury@gaslightmedia.com>
Fri, 3 Jun 2016 17:48:22 +0000 (13:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 3 Jun 2016 17:48:22 +0000 (13:48 -0400)

Trivial merge