new option name ("Match background"), taken from beta branch
Merge branch 'master' into ice-cream-sandwich