Don't require # for calendar colors (see #136, closes #238)
Improve handling of unknown timezone definitions (should fix #333)
Merge remote-tracking branch 'upstream/master'
Small fix for sync with kolab