Fixed convergense pointers. Again.
Merge branch 'master' into Presentation