Make it so that publish works
Merge branch 'develop' into ndReleases