Merge branch 'master' into use_css