Sync'd branch projects/oak with upstream @ Fri Sep  5 06:59:06 PDT 2014