demand + startmenu stuff
Merge remote-tracking branch 'origin/master' into ebooks-and-graphics