Update upstream source from tag 'upstream/0.25.0'
authorVasudev Kamath <vasudev@copyninja.info>
Sat, 24 Feb 2018 07:22:56 +0000 (12:52 +0530)
committerVasudev Kamath <vasudev@copyninja.info>
Sat, 24 Feb 2018 07:22:56 +0000 (12:52 +0530)
Update to upstream version '0.25.0'
with Debian dir 44c2a43b3d0c56627bb5fb049db7430d3382d218


Trivial merge