Sync'd branch projects/oak with upstream @ Fri Aug 29 13:20:08 PDT 2014