Comments on date, file and lang.
Merge remote-tracking branch 'origin/dev' into dev