Merge pull request #1066 from jmaas/master

Remove mysql support + move func integration into contrib
Minor manpage update.