Just in case
Merge commit '66b9a37650665514b2ec44605b77edb70a458609'

Conflicts:
	ipch/vme-5eb775f0/vme-7e085854.ipch
	vme.sdf