Committing
Merge branch 'master' into pull_rprasadk_20130621094746720

Conflicts:
	kill_runner_processes.bat