complete #867

As #867 is specifically reported as an ontohub.org issue, we need to merge the current state of staging into master.