1.0.1
Merge branch 'v1.0.x' into devel