Fix text justify for books
Merge remote-tracking branch 'upstream/books' into books
*Fix build after merging remote-tracking branch 'upstream/master'