roll-back date/time format on collection detail/history
Merge remote-tracking branch 'origin/master'