Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc