Merge proposals dependent on lp://qastaging/~jan-simon/ubuntu/precise/ubuntu-docs/fix-for-913926

1. Precise (12.04)
2. fix-for-913926
3. Dependent merge proposals