This merge is the "theirs" merge, so the tree is exactly the same as 8ebf643b6e178dcdaf548e29022aa8d4fa58651ci (thickpaddy/master as of the merge). This is based on my assumption that there's no new change made in the former master tree. A casual inspection of the commit history implies that this is correct (aside from release attempts and other POM changes.)
…eal with exceptions they can't recover from.
…n't be found