syncronized with upstream. version 1.9.1-6