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