This may need a patch for 1.8.2, but we can try to directly apply it cmr=v1.8.2:reviewer=hjelmn This commit was SVN r31754.