Imported Upstream version 2.5.3
Merge tag 'upstream/2.5.3'

Upstream version 2.5.3
Modified debian/* for upstream version 2.5.3.