Various documentation fixes

Signed-off-by: Dries Vints <dries.vints@gmail.com>
Merge pull request #1531 from driesvints/bugfix/overall-fixes

Documentation and dependency fixes
Merge branch '4.0'