Merge commit 'origin/4.6' into large-file-support