Merge latest bug fixes from lbl-srg repository to annex 60 repository.