Squash commits for auto-recording

Author:    Laura Chen <laura.di.chen@gmail.com>