Merge pull request #1 from githubserver/master

Master
Merge pull request #2 from githubserver/master

Commit
Merge remote-tracking branch 'origin/feature1'