change from prakashsrriam-1
Merge branch 'master' into prakashsriram

Conflicts:
	prakash.txt
Merge branch 'master' of https://github.com/elephantscale/ctl