Merge remote-tracking branch 'plq/master'
doc update
Merge remote-tracking branch 'plq/master'
Merge branch 'master' into 2_11