Updated for rust 00cc6d240 2014-10-24 03:22:29