Merge branch 'master' into argdist-silent
authorSasha Goldshtein <goldshtn@gmail.com>
Mon, 22 Feb 2016 10:36:43 +0000 (12:36 +0200)
committerSasha Goldshtein <goldshtn@gmail.com>
Mon, 22 Feb 2016 10:36:43 +0000 (12:36 +0200)

Trivial merge