https://github.com/seajs/seajs/issues/1228#issuecomment-52413368
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/seajs-css.js
https://github.com/seajs/seajs/issues/1228#issuecomment-52413368