CRAFTERCMS-185: 'Collapse All' doesn't work properly
Merge remote-tracking branch 'david/master'