Use date-order in git pretty logs
Merge branch 'master' into osx