Updated version 0.21.1 from 'upstream/0.21.1'
authorVasudev Kamath <vasudev@copyninja.info>
Mon, 18 Sep 2017 15:48:18 +0000 (21:18 +0530)
committerVasudev Kamath <vasudev@copyninja.info>
Mon, 18 Sep 2017 15:48:18 +0000 (21:18 +0530)
with Debian dir 11909be72f2dce9c35dfe09d07ff634ee4ed0bb2


Trivial merge