Configure ruby rules to act as intended
Merge branch 'master' into ST2