Merge remote-tracking branch 'github/master' into dev/dj-tileload

* github/master:
  Specify an equivalant tab width of 4 spaces in gitattributes
  Fix small issues with commit 680d3188
Adding TileStats class for performance measurement
Working performance measurement
Merge branch 'dev/dj-performance-measure-http'

* dev/dj-performance-measure-http:
  Working performance measurement
  Adding TileStats class for performance measurement