Merge 1.2

Fixes #2