""
""
""
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/tutorial.xml