Merge commit 'origin/master' into dev-mini2440-stable