Merge branch 'select/rc23042013' into select/release