update for Go 1.3 paths
merge