Completed pass through 4.1
Merge branch 'master' of github.com:nfeltman/RenderGen