Fix the honeypot tour
Merge branch 'release/29092013-2'