Merge branch 'gh-pages'
Bug fix in export view.
Merge branch 'master' into gh-pages