Merge branch 'develop' into 'master'

Incremented version number

See merge request !17
2 jobs for master in 4 minutes and 40 seconds (queued for 2 minutes and 29 seconds)