remove references to the builder; bug 961403
Merge pull request #1678 from clouserw/builder

remove references to the builder; bug 961403