Merge commit '1aca962af153d6437937e3e687740d2c1c12657d' * commit '1aca962af153d6437937e3e687740d2c1c12657d': allow for malformed imagesizes.txt
Merge commit '1aca962af153d6437937e3e687740d2c1c12657d' * commit '1aca962af153d6437937e3e687740d2c1c12657d': allow for malformed imagesizes.txt