Merged revision(s) 2438 from branches/release-1_1:
Prevent 'shoot' script command from hanging in rare cases where camera doesn't take a shot.