merge from srs gh-pages.