restored a timeout for the remoting spec
Merge remote-tracking branch 'upstream/dev' into remote-fixes
Merge pull request #122 from Aaronontheweb/remote-fixes

Fixed a minor issue with RemotingSpec