Merge branch 'depcomp-work'