Update from current upstream (r18456), version bump to 0.1.1

Version bump just because it's been a while (3 months now),
no code changes.