Added w_scan (20140727)
Merge branch 'master' into next

Conflicts:
	repo-make.conf