Commit 6dbbced2b18f5bb17306bc9baf08e6b4f18acfc7

Carlos Martín Nieto 2015-02-12T00:27:17

Merge pull request #2889 from jeffhostetler/jeffhostetler/merge_performance Large merge perf test.