Fixes from master, language updates.

See commit history, duplicate pull being thrown at master.