Update from original gluster:master