small mergefixes
Merge branch 'daniel'
Merge branch 'master' into sean