Implemented phusion/baseimage issue #1
Merge branch 'phusion/baseimage-docker'