feature1 in upstream
additions to feature1
Merge pull request #1 from logiclocker/feature1

Feature1