Edited in navas machine
second change
Merge remote-tracking branch 'gittest/master'
entered in navas machine