Super-important bugfix (typo in comment)
Merge documentation fix from 'stable'.