Merge commit 'v3.2' into rt-3.2-rt9