Commits

Katja Marttila committed e408037e224M
Merge remote-tracking branch 'origin/3.0' into master Change-Id: I09cacedb966eebc3f42a3402b0b3dc4f6dcd9be8
Merge remote-tracking branch 'origin/3.0' into master Change-Id: I09cacedb966eebc3f42a3402b0b3dc4f6dcd9be8