Merge branch '1.2'

...e.