Updated JavaDoc to M4 Release
Merge remote-tracking branch 'origin/declan' into nathan