0.9.x

The difference between master and 0.9.x branches seems to minimal and include one bugfix and one non-breaking enhancement. This seems innocuous to merge.