Merge branch 'dev-master' into dev-3.x
Merge branch 'dev-3.x' of github.com:yui/yui3 into dev-3.x