PR: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23174 Submitted by: Maarten Coene, Arun Mammen Thomas Reviewed by: Gary Gregory