merge with phusion/baseimage branch