Merge "Improved some Context javadocs."