Merge branch 'master' of ssh://code.systems.ethz.ch:8006/diffusion/BFI/barrelfish