Merge branch 'phusion/baseimage-docker'
merge with phusion/baseimage branch