merged changes from branch (excludes fst 2.0 cross platform)
oops
Merge branch 'master' of https://github.com/RuedigerMoeller/serialization-benchmark

Conflicts:
	src/main/main.iml