integrate d4fe0a8... from v1.1 branch
fixes: sodor passing its unit tests
integrate d4fe0a8... from v1.1 branch
fix: use width_ instead of getWidth - makes it easier to produce intermediate graphs