Merge /home/simon/acme-experiments
merlin: complete.
merlin: fixes json parsing.
Merge /home/simon/acme-experiments
Cplt