Update to fe2c3b6 from source