Al mrg 1477

Pull to get charset into master branch