color colibri (bis)
Merge branch 'master' into gh-pages