Merge 0.9.14 changes back to master.