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