Update for current git master

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>