[rename] [fix] merge related fixes
Merge branch 'master' of github.com:webnotes/wnframework