Merge branch '1690_patch_for_djvu'