Import v2.4
Merge tag 'v2.4'

Conflicts:
	bootstrap