Ported from gsoc svn.
(cherry picked from commit ead15f1d)