Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-21-12-07-36
authorKurund Jalmi <kurund@yahoo.com>
Wed, 21 Oct 2015 06:38:04 +0000 (12:08 +0530)
committerKurund Jalmi <kurund@yahoo.com>
Wed, 21 Oct 2015 06:38:04 +0000 (12:08 +0530)

Trivial merge