Fix jscs
Merge branch 'master' into property-groups