[MERGE] Merged trunk-improve-google-doc-vba.