Merge branch 'master' into backport_intellij_10

Conflicts:
	.idea/compiler.xml
backport some utils
Merge remote-tracking branch 'origin/backport_intellij_10' into backport_intellij_10