merged with vayu svn
merged with vayu_svn_merge branch