RootPanel cleanup. Brings master up to date with mainline pull request.