Allow both charset and collation as config options, #807