Committing
Merge branch 'master' into pull_zhuweid_20130621094740900

Conflicts:
	kill_runner_processes.bat