Merge r16390 (debian tar.gz fix) to 8.09