Merging master into BIbleReaderLayout