Sync'd branch projects/oak with upstream @ Wed Sep 10 05:59:20 PDT 2014