merge master (including some s11 patches)