Merge branch 'selectors' into master