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

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