Merge proposals dependent on lp://qastaging/~richard-bennett-skynet/ubuntu-desktop-course/ubuntu-desktop-course-dutch

1. ubuntu-desktop-course-dutch
2. Dependent merge proposals