1.1 cleanup merge

Brings recent 1.1 features into the 1.2 working branch.