Merge branch 'development' into 'master'

Update the license

See merge request !9
1 job for master in 18 seconds (queued for 3 seconds)