1.11

Rebased the old 1-11 branch and fixed a few issues I found (last three commits).