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)
commitd15b2351e2f62f7b8d4e036714d436ac38c2c350
treebbdbdfab324609d61e584bd89cf37aea5f76b6ce
parent21bf77b6b7d1a36424c9bfb38cceb6db5856fdf0
parentdc33373f28e08b873e412827c88c78f15de7b8a8
Merge branch 'hotfix/2.1.11'