Awesome work from Jason Height http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10581 PR: Obtained from: Submitted by: Reviewed by: