Signed-off-by: Ralf Bartel <bartel.rj@gmail.com>
Merge branch 'minorchanges' into minorchanges2