Imported Upstream version 2013.2
Imported Debian patch 2013.2-4
Imported Upstream version 2014.1.a25.g271e258
Merge tag 'upstream/2014.1.a25.g271e258'

Upstream version 2014.1.a25.g271e258
Upstream snapshot 2014.1.a25.g271e258
Merge remote-tracking branch 'origin/master'