Merge branch 'master' into chenli/master/wiki_changes