Merge pull request #1017 from oliverds/master

Panel Tour #964