Closed KWARC/mws-frontend#16
Merge branch 'master' into gh-pages