merged from gh-pages.
Merge branch 'dev'