Merge branch 'hector'
Merge branch 'hector'
Merge branch 'master' into hector