Merge pull request #1 from mellanox-hpc/master

Update from upstream