Merge docker into master