Merging disorganised branches.
Committing all changes...
Merge commit 'b4b52b79e1b944eeddf74c737e9734a8dc11a753' into current

Conflicts:
	src/mu2_logger.erl