1.2.0
68fc331e · Merge branch '1.2' into 'master' ·