More changes

More changes
Merge remote-tracking branch 'origin/master' into narayan
Batch 7
Merge branch 'narayan'