Feature ipdate from syddjurs.
Merge branch 'develop' into release-1.0
Merge branch 'release-1.0'