changes for Debian package
Merge remote-tracking branch 'rt/master'