Updated version 0.22.0 from 'upstream/0.22.0'
authorVasudev Kamath <vasudev@copyninja.info>
Thu, 26 Oct 2017 16:30:38 +0000 (22:00 +0530)
committerVasudev Kamath <vasudev@copyninja.info>
Thu, 26 Oct 2017 16:30:38 +0000 (22:00 +0530)
with Debian dir df35b36f6b40533c109b20cab36a943be981109f


Trivial merge