Merge branch 'mockturtl.patch-1'