merges from master
fix for #475, allows fields to be hidden with a single annotation