Sync'd branch projects/oak with upstream @ Sat Aug 30 21:40:08 PDT 2014