commit by ruma
Merge remote-tracking branch 'eBookUniverse/master'
Committed by ruma