Merge pull request #1901 from bradymiller/docker-dev-changes_1