cosmetics
Merge branch 'master' into icalendar

* master:
  cosmetics