Merge branch 'master' into rad-xe

Conflicts:
	include/bike/s11n-text.h
Fixing commits