testing selector on a per choice basis #497
resolve merge conflict removing selector #497
Merge remote-tracking branch 'upstream/master'
Merge pull request #1195 from ralfharing/master

testing selector on a per choice basis #497