Merge branch 'cpp11' into utf8

Conflicts:
	graphic/widgets/logwnd.cpp