tree c0e11a849d6cbfcca7dee980cf2dc70f55092419
parent eac602304c8bb47d7d96f25b86c83597086fdde2
parent 26cf01aaba21c73fe4a554dc954cc63dfde4a731
author Rushabh Mehta <rmehta@gmail.com> 1469500083 +0530
committer GitHub <noreply@github.com> 1469500083 +0530

Merge pull request #5865 from rohitwaghchaure/v7_fixes_and_cleanup

[mionr] fixes and cleanups