Handle "Invalid byte" error in msgpack
Merge branch 'master' into portico

Conflicts:
	pom.xml