WIP 1.2.0

Contains work to be included as part of version 1.2.0.