Help needed with Bug 1198299 - calibre fails to build in 15.4