Update Classic to include new fix
Merge remote-tracking branch 'mandli/master'