Grafted from 5725:1d38ca918d87 and resolved conflicts
Applied patch from Richard JW Roberts, resolving Bug 704