WIP 1.1.3

Contains work to be included as part of version 1.1.3.