Merging release_branch_1.0 into master