Merge pull request #2459 from ntd/bicker