Merge remote-tracking branch 'origin/master' into 57577828
make epub container not dirty on load
Merge branch '57577828' into testing