Merged upstream zpresto

Merged upstream zpresto.

Signed-off-by: Bart Kerkvliet <bkerkvliet@gmail.com>