Merge pull request #13128 from colemanw/jstree