Merge pull request #1323 from sergey-safarov/docker