Fixes a few shutters. Root cause unknown.
Merge pull request #3202 from meyar/bleeding-edge-freeze

Fixes a few shutters. Root cause unknown.