Merge branch 'master' into chende
starred->1
Merge branch 'chende'