fix relative path in .gitignore
Merge branch 'master' into queues