Merge branch 'patrick'
Merge branch 'master' into patrick