Imported Upstream version 2014.01.11
Merge tag 'upstream/2014.01.11'

Upstream version 2014.01.11

Conflicts:
	s9.1.txt
log changes