Merge master forward into 0.9-work.