Merge branch 'master' into neaten-graph-mapper2

Conflicts:
	pacman/model/graph_mapper/graph_mapper.py
Merge branch 'neaten-graph-mapper2' of github.com:SpiNNakerManchester/PACMAN into neaten-graph-mapper2