Pre collision commit
Post collision. Everything went better than expected
Merge branch 'master' into marc