WIP on issue #1002
WIP free space when no more item in collapsedItems
Miminal changes
Fixed issues #1002, merged with master
Clean up
Merge pull request #1160 from malderete/master

Fixed issue #1002