also for branch

[Julien Rioux]

Richard, I just committed r39637 to r39643.
These should be considered for branch.

--
Julien