Add sstate-cache/ to .gitignore.
Merge remote-tracking branch 'origin/master' into measured