NOTE: we track master upstream so we are some commits ahead v 1.5.1. Signed-off-by: Andrea Adami <andrea.adami@gmail.com>