0.11 support, backported from my 0.12 support PR

I suggest we tag this 1.0.

Then merge in the 0.12 support PR and tag it 2.0

Does this seem allright to you?