Merge branch 'develop-v2.1.4' into 'master'

Version bump v2.1.4

See merge request !29
1 job for master
in 36 seconds, using 0 compute credits, and was queued for 2 seconds