Merged changes for bug 392836 into head
42 files changed