Update core.
Merge pull request #484 from gsn/master

Update core.