Fix error when publishing packages from 'master'

The 'develop' and 'master' branches had diverged and apparently this prevented packages from being published from the 'master' branch.

To fix this, the 'master' branch was merged into 'develop'. With this merge request we will bring the changes from 'develop' to the 'master' branch.