Merge pull request #7810 from parismita:patch-1
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 14 Dec 2016 14:54:53 +0000 (14:54 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Wed, 14 Dec 2016 14:54:53 +0000 (14:54 +0000)

Trivial merge