Merge pull request #766 from feckert/config_diag_url