Comment 14 for bug 1354494

Please submit this patch to upstream, so that in 6.0 (or later if it takes too long) we can resync with an upstream version that includes this functionality. Targeting to 6.0 as Medium to track that.