Fixed master to compile with rustc as of 09/06
Merge branch 'master' into sgf