Updated to merge the latest renderjs master branch into our fork.