Imported Upstream version 4.99.6~20131003
Merge commit 'upstream/4.99.6_20131003' into debian/squeeze
New upstream import