Merge branch 'master' into devel
Merge branch 'devel' into gavin