Merge branch 'james-dev' into 'master'

Bug fix

See merge request !17
6 jobs for master in 47 minutes and 59 seconds (queued for 2 seconds)
latest