Merge remote-tracking branch 'refs/remotes/david/master'

Conflicts:
	ChangeLog
	README
	README.md
	configure
	include/f8includes.hpp
	include/ff_wrapper.hpp
	include/mpmc.hpp
	runtime/session.cpp
	test/myfix_server.xml
	version.sh