Merge branch 'fix-compilation-with-go1.2'