Make master awesome

At attempt to bring `master` up to speed with `0.9.x`