Merge branch '4.3' of dhozac@git.planet-lab.org:/git/bootmanager into 4.3