merged 2.10.x branch into trunk and resolved resulting conflicts. Needs testing to ensure it didn't break anything.
merged 2.10.x branch into trunk and resolved resulting conflicts. Needs testing to ensure it didn't break anything.

Gerberus/phplist,Gerberus/phplist,Gerberus/phplist,Gerberus/phplist,Gerberus/phplist