made RemoteLoader fall back to trickle load correctly #512
Merge branch 'bugs/512'
fixed assert ids for master #512
Merge branch 'bugs/512'
Merge branch 'master' into cc5