Merge branch 'devel' into gavin
Merge remote branch 'origin/gavin' into gavin