Wrap-around.
Merge branch '0.11.x'