Merge branch 'master' into f23

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