Merge branch 'master' of ozlabs.org:ccan