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