Merge pull request #606 from timw4mail/develop

PDO/MySQL charset setting fix.