bad idea using universal transitions
Merge branch 'master' into gh-pages