talking points for monday
Merge remote-tracking branch 'origin/master'