x'x'x
Merge remote-tracking branch 'origin/blog-1.0' into blog-1.0