Merge branch/2014-02-26/args-done into master sources.