Fix ignore fields
Merge branch 'master' into postgresql