Sync'd branch projects/oak with upstream @ Mon Oct 20 18:20:16 PDT 2014