Added really simple exclusion criteria to make Sando usable again.
Merge branch 'master' into sando-stable