This commit is the same as the commit 18aa217b and 99e616a6 on master
branch, except "ALL" keyword.
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>