Commit 57c769c8ff5deb57e9686accaa8ae95ecd737b93

Steffen Jaeckel 2017-12-21T18:20:36

Merge branch 'fix/doc' into develop