Merge pull request #7764 from pengli:pyr_up
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Dec 2016 11:05:15 +0000 (11:05 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 2 Dec 2016 11:05:15 +0000 (11:05 +0000)

Trivial merge