Merge pull request #7077 from LaurentBerger:I7063
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 15 Aug 2016 09:08:44 +0000 (09:08 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Mon, 15 Aug 2016 09:08:44 +0000 (09:08 +0000)

Trivial merge