Merge: rev781 (Cut 13.04.10 release)