Merge pull request #7016 from monishdeb/4.6-master-2015-10-21-10-54-28
authorMonish Deb <monish.deb@webaccessglobal.com>
Wed, 21 Oct 2015 05:34:13 +0000 (11:04 +0530)
committerMonish Deb <monish.deb@webaccessglobal.com>
Wed, 21 Oct 2015 05:34:13 +0000 (11:04 +0530)
4.6-master merge forward


Trivial merge