Merge branch 'wiki-import' into stable-1.8