* Added a comment to the config file
Merge commit 'bf16de927fb104c504aa466b6e4429a3f511d87a' into branch-test
Merge branch 'master' into branch-test