this was merged to Encode and core
review for 2013-01-24