Merge branches 'master', 'master', 'master' and 'master' of http://common-lisp.net/project/asdf/asdf