Merge "Account for crop in checksums" into qt-dev