Merge commit '5136e726015b2bea3309f44c503ccc49e264cdb6' * commit '5136e726015b2bea3309f44c503ccc49e264cdb6': Don't snap the initialScale to min or max if it is not defined.