Merge tag 'debian/1%20151213' into debian