Merge 'lukaszspyra/issue-1275-broken-javadoc' (#1275, #1753)