Merge 0.13.2

Merges changes since 0.13.2 final into 0.13 branch.