Merge branch 'master', remote-tracking branch 'origin' into daley
Fix regression build
Merge branch 'daley', remote-tracking branch 'origin'