Merge 0.13.6

Merge 0.13.6 RC fixes into mainline.

Review by @eed3si9n