Bug 880768, retry

fresh pull request, because the old pull had mystery commits from other branch in it, and rebasing on master duplicated some commits.