Go1.1 fixes.
Merge branch 'master' of github.com:AeroNotix/freepoint