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