Bump version number
Update changelog
Merge branch 'master' of https://github.com/asciidoctor/asciidoctor-diagram