0.7.4:

* Back-ported changes from trunk.