Merge pull request #2253 from ey6es/master

Initialize scale to unity.  Closes #2232.