Merge pull request #2538 from vlakoff/develop-4

Fix config_item() returning stale values