Fixed spinner support
Merge branch 'master' into requirejs-b3