Javadoc link tag bugfix
Fix javadoc
Merge branch 'mdpsock' into walkietalkie