Revert "Revert "Merge conflicts""

This reverts commit ff6ee5b7f7e4ee12765831997870aae33bc4e1d7.
Revert "Revert "Merge conflicts""

This reverts commit ff6ee5b7f7e4ee12765831997870aae33bc4e1d7.
Merge branch 'master' into kevin