qj
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	docbook/userguide/chapters/ch01-Introduction.xml