Merge branch 'master' into jquery-ui
Merge branch 'master' into jquery-ui