Merge branch 'zhenguang-web-patch' into 'master'

@qalshidi commiting for @zghuang

See merge request !6
1 job for master in 1 minute and 10 seconds (queued for 1 second)