Merge branch 'fixes' into sumatrapdf