Merge master into nice-wrapping.