Merge branch 'parse-into-fusion-map' into develop

Conflicts:
	test/x3/sequence.cpp