edit by b2
Merge branch 'b2'

Conflicts:
	a