scriptcs/scriptcs — pull request #560 by filipw (2014-01-28 08:45:17+00:00)
Title: mergeable PR for #331

This is #331 from @lbargaoanu moved by hand.
We couldn't cherry pick it anymore since the codebase has evolved so much since.