Commits

Katja Marttila committed 70273f9931aM
Merge remote-tracking branch 'origin/3.0' into master Change-Id: Ifaa114464151f5ed84ce47a3368c1521eb17a0be
Merge remote-tracking branch 'origin/3.0' into master Change-Id: Ifaa114464151f5ed84ce47a3368c1521eb17a0be