Undo disabling of the reconfiguration checker, pending further study
Merge remote-tracking branch 'upstream/master' into upstream
recursion control
ID the album class
Merge pull request #140 from sbillard/master

upstream merge & cumulative changes