Merge branch 'js/log-to-diffopt-file'