bugfix?
Merged 'dev'.
Finish webreader-update