Added master local 2
Created master-6
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from sgala-juniper/master

pull request