updates from Aram, Alexis, Sylvie, et al
Merge remote-tracking branch 'origin/master'