Make sure we close both bit-maps.
Merge branch 'master' into v2.2