Pushed some minor updates to r/2933
Continued work on bug 1073732 yesterday until the small hours…