Merge branch 'master' into f24

This commit is contained in:
Martin Stransky 2016-04-26 10:52:16 +02:00
commit ffd6858fac