Add shortcut for replaceByMock method into mock proxy, so less code needs to be written
Merge branch 'release/0.3.6'