update to 3.7
Merge branch 'master' into ext4

Conflicts:
	kwf_branch