Merge branch 'upgrade'
set host for jpegoptim