Merge remote-tracking branch 'origin' into convey_mongo-file-system

Conflicts:
	libver.inc
Merge branch 'development' into convey_mongo-file-system

Conflicts:
	libver.inc