Merge branch 'depends' into mymaster

Conflicts:
	src/webassets/bundle.py