Merge pull request #1263 from jmaas/master

Several fixes
Docs. Developer-guide add missing dependencies.