Merge branch 'v1.0' into 'v1.0'

Version 1.0.2

See merge request !22
2 jobs for 1.0.2