Merge pull request #1 from fluffos/next-2.27

Next 2.27