PERF: Big speedup in ribbon
Merge branch 'master' of https://github.com/jcowles/demo-13