Merge pull request #742 from nico/maniperf