both from command line and from config files. Cherry-picked from svn trunk. Thanks Godefroid.
Attach a file by drag & drop or click to upload
