Merge branch 'master' into batch-editing