Merge branch 'master' into debian c11dc1727877a8c8225e2d5c63607181012300a8