Sync'd branch projects/oak with upstream @ Sun Aug 31 19:40:14 PDT 2014