Pull changes into FridayPub

foting/fp is ahead of FridayPub/fp, without conflict.