Merge pull request #282 from ianlancetaylor/master

handles, merge, odb: changes for Go 1.6 pointer passing rules