committing to merge
merged with jacques' (almost identical) changes