merging master into devanganaS branch...

master changes are in my branch now..