Merge from HEAD. Signed off by tmack.