Merge branch 'rfree' into rfree_mingw_test

Conflicts:
	src/CMakeLists.txt