Commits

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