Merges branch sol006 into master, allowing NBI to use, parse and validate SOL006...