Fixed issue: Various problems when reloading a saved entry on a survey using tokens and anonymized responses
Merge remote-tracking branch 'origin/master'