move the <time> element up in the dom
Merge remote-tracking branch 'upstream/master'