AUI-1043 Using more comprehensive selector on conditional
AUI-1043 Source formatting
Merge branch 'master' into 2.0.x