Merge branch 'caldav' into npm-publish-fork
0.3.6