Update to 6b6912d from source