Merge pull request #1576 from shackbarth/publish