Merge pull request #2080 from colemanw/checkSqlFunctionsExist