Manually merge trunk into gh-pages