Log Message:
Update to 1.0.5:
The main change with this release is that it includes API additions
from the 1.1.x branch (while being backward compatible), so that
transition from 1.0.x to 1.1.x can be made easier.