Sync'd branch projects/oak with upstream @ Wed Aug 27 07:11:07 PDT 2014