Bug 815093 - Merge master