SS-1 change
Merge remote-tracking branch 'origin/master' into SS-1

Conflicts:
	Here is text file 2
Merge remote-tracking branch 'origin/master' into SS-1

Conflicts:
	Here is text file 2
text file 4
Merge pull request #2 from rvilat/SS-1

Ss 1