fixed ignores
Merge branch 'master' into trunk