merge trunk (master) -> branches/gh-pages