Sync'd branch projects/oak with upstream @ Thu Aug 28 09:48:11 PDT 2014