Finish 1.0.x
Merge branch 'origin/master'