Merge pull request #1003 from annando/getid-default