Merge branch 'master' into release_branch_1.0
Merge branch 'release_branch_1.0'

merge kill list edits