Rafael wants to merge the latest changes from master into gh-pages.