Rev 585
Typos?
Merge tag 'rev585_vanilla'