Added files which were edited while resolving this issue on FreeBSD https://code.google.com/p/go/issues/detail?id=3017