update to 0.63
Merge 'upstream'