Updated upstream sources to 0.98.1