close jpeg branch
integration jpeg -> mainline