Merge remote-tracking branch 'origin/issue2' into devel

Conflicts:
	README.md
foo
Merge remote-tracking branch 'origin/issue3' into nightly

Conflicts:
	README.md