Bring up to date with release 1.2.0