Bug 1006031 - add file
Merge branch1 into integration-master