made RemoteLoader fall back to trickle load correctly #512
Merge branch 'bugs/512'