Merge "minor Rect.h cleanup" into jb-dev