Merge branch 'master' into inform7