Update to 79e3828 from source