GH #186 - Renamed custom_config to user_config.
Merge branch 'master' into dsuch-f-gh175-pubsub-rest-interface