Merge branch v1.0 (commit fb1987b) into master