Commits

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