Merge branch 'master' into f22

This commit is contained in:
Martin Stransky 2015-05-05 11:44:58 +02:00
commit 214368e9a1