Update to allow using latest docker from master