Merge remote-tracking branch 'upstream/master' into tree-hide-chevron-children