Merged in default (pull request #669)

Shrink the delta from PR 666

Approved-by: Gary Kramlich
Approved-by: Elliott Sales de Andrade