Bug 1006091 - add file
Bug 1006091 - merge #1 from autolander:branch1 to autolander:master