Update calendar through 2014/11/05

I forgot to merge upstream first but I don't think it's an issue (please let me know if it is though).