Fix the mock_clean option handling
Version bump
Merge branch 'release/2014.3' into develop