More work on getting golang working
Merge remote-tracking branch 'hosted/master'