1.2

See master for full changelog