Merge pull request #146 from avinashcpandey/develop

AMP Merge Sort fix for 65535 tile limit issue + small optimization in Me...
fixed for compilation errors