Merge branch 'james-dev' into 'master'

James dev

See merge request !14
4 jobs for master in 4 seconds (queued for 1 second)