WIP
Merge branch 'hg-jordi' into gh-pages