now background is grayed out but not foreground
Merge remote-tracking branch 'origin/master'