Merge remote branch 'origin/stable' into dev-mini2440-stable