Merge remote-tracking branch 'upstream/pregmod-master'

ease enter a commit message to explain why this merge is necessary,
 especially if it merges an updated upstream into a topic b

 Lines starting with '#' will be ignored, and an empty message aborts
 the commitggggg.