Merge.
Merge branch 'master' of https://github.com/weigo/NWDI-JavaDoc-Plugin