Commits
Merge remote branch 'fsorig/master' into releases.3.5 Conflicts: build/modules.conf.in libs/freetdm/mod_freetdm/mod_freetdm.c
Merge remote branch 'fsorig/master' into releases.3.5 Conflicts: build/modules.conf.in libs/freetdm/mod_freetdm/mod_freetdm.c