Patched calendar module with https://www.drupal.org/node/1471400#comment-8405521