Merge commit 'sebastian/manpage'