metallica
from master
Merge branch 'branched-from-master' into b1-branched-from-b1-renamed

Conflicts:
	file