Log Message:
sync with -current:

Move Keith Muller's code from a 4-clause to a 3-clause licence by removing
the advertising clause. confirmed to the board by Keith Muller.