Sync'd branch projects/oak with upstream @ Fri Aug 29 17:50:09 PDT 2014