Merge commit 'v1.0.1' into 1.1.x-stable