3.4 name list
Merge branch 'master' into release_branch_1.0

Conflicts:
	kill_list.md
Commit

Conflicts:
	kill_list.md