Merge "DO NOT MERGE - Updated some javadocs." into qt-dev