Also use ~ attribute selector in the mixin to avoid partial matches
Merge latest modification from master