fixes
Merge branch 'master' into jquery-seed-web