Merge remote-tracking branch 'symac/patch-7'

Conflicts:
	libraries/BookReaderCustom_extractOCR.php