Merge branch 'cpan_mock_it' into QA