meeseeksdev please backport to 0.12.x

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

1. Checkout backport branch and update it.

git checkout 0.12.x
git pull

2. Cherry pick the first parent branch of the this PR on top of the older branch:

git cherry-pick -m1 788c3d5363b63ff082b1ad05c12ac6842c7ef2c8

3. You will likely have some merge/cherry-pick conflict here, fix them and commit:

git commit -am 'Backport PR #1420: Update Galata'

4. Push to a named branch:

git push YOURFORK 0.12.x:auto-backport-of-pr-1420-on-0.12.x

5. Create a PR against branch 0.12.x, I would have named this PR:

"Backport PR #1420 on branch 0.12.x (Update Galata)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.