Release 1.0-2
Merge branch 'master' into 1.x