including testing
Merge branch 'master' into v1.1
Merge branch 'master' into locale-sk