Merge commit '3c385116e98e6812813049206cb85417f1bccb21' * commit '3c385116e98e6812813049206cb85417f1bccb21': don't allow min scale to go to infinity