Fetch latest fixes from the main repo

Changeset 016a78c09384.
Bump version