Forgot to commit. Emergency fix for editing not working
Merge branch 'master' into links