Rebase on gmacario/baseimage:0.9.15b

This should fix https://github.com/gmacario/easy-build/issues/79

Signed-off-by: Gianpaolo Macario <gmacario@gmail.com>