am 8e55e88f: Merge "Fix broken Javadoc links" into kraken