Merge pull request #1159 from ryanjbaxter/master

Fix that monitors the container configuration for changes