Merge commit '4f062177' into origin/release_sp3_ios_collaboration_document # Conflicts: # public_new/js/share.js
