Updated from merge with Master
Merge branch 'master' of https://github.com/SpiNNakerManchester/SpiNNFrontEndCommon.git