Pulled the latest changes from the official repository as at r4858
Re-merged the current h2 official trunk (r4858) with the remainder of my changes
Re-merged the current h2 official trunk (r4858) with the remainder of my changes
Re-merged my patches relative to the official trunk
Re-merged my patches relative to the official trunk
Pulled latest changes up to r4863