Semicolon fix
Merge branch 'dev' into v2.6