Upgrade to Aether 0.9.1
Merge branch '1.0.x'