merged with moravianlibrary/RecordManager/master branch