no-reload regained: css moved to the right place
Merge branch 'master' into test-interface