Merge pull request #1025 from nicolasdespres/resurrect-rules-tool

Resurrect the 'rules' tool.