Merge branch 'master' into driver_framework

This commit is contained in:
Lorenz Meier
2015-11-20 09:46:25 +01:00