Update the TOS
Merge branch 'master' into sandbox