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