Merging rendererBranch into master.