Merge non-conflicting change from master.
Role up currently developed version to 0.8.11-SNAPSHOT.