Commits

Katja Marttila committed 3f281b049c8M
Merge remote-tracking branch 'origin/3.0' into master Change-Id: I601b783a9d2eed009737b2779803457949cbb014
Merge remote-tracking branch 'origin/3.0' into master Change-Id: I601b783a9d2eed009737b2779803457949cbb014