Fix: misc errors for date_plugin_display_attachment.inc
Merge remote-tracking branch 'origin/date' into date