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