Merge branch 'master' into ding1-theme