Changed version to 0.4.1dev for patch release
Merge branch 'master' into plugins

Conflicts:
	configure.ac