remove ;
Merge branch 'master' into portable
missing dict_init()
Merge branch 'master' into portable