Commits

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