Adding patch from http://drupalcode.org/project/shurly.git/commitdiff/ec9d39c.