Import changes from calendar.i.o.o
    
    Importing miscellaneous manual changes found on the the machine.
    
    Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>