Merge master into fb-remoting