Merge pull request #916 from Tuvie/master

Merge master changes to rdma branch