http://forge.ow2.org/tracker/?func=detail&aid=317578&group_id=23&atid=100023 (cherry picked from commit 0c2b787)
0c2b787