Backports some feaures from Psych bundled with 2.1