restored proper two-minute span
Merge remote-tracking branch 'origin/master'