two commits to merge

as described at above...