Merge branch 'master' into splunk_config_recipe