Fixed a bug Jesse found in remoting
Merge branch 'rc'