Merge branch 'hotfix/2.1.11' v2.1.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:36:47 +0000 (17:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 21:36:47 +0000 (17:36 -0400)

Trivial merge