Cleaned up the Dockerfile to make it easier to read.
Merge branch 'refs/heads/prepare-2.1.3'