Merge branch 'master' into lua_support