Remove protected stuff from the javadocs
Merge remote branch 'origin/unstable_staging' into unstable_staging