v266 branch Changes

v266_preview2 to v266_base (2012-04-17 to 2012-04-24) v266