Sync'd branch projects/oak with upstream @ Mon Sep  1 09:58:13 PDT 2014