fix brokenness from 0ab6bff3
Merge branch 'master' into integration