Moved the function_mock code up a level, removing the extra function_mock folder.
Merge remote-tracking branch 'origin/master'