Merge branch 'master' into ja/lua