Merge pull request #960 from jmaas/master

Unbreak package building caused by #955