Changes for second merge test in eclipse
Merge remote-tracking branch 'origin/master'