Fix a couple issues with grapples.
Merge remote-tracking branch 'origin/master'