Sync'd branch projects/oak with upstream @ Sat Sep 20 17:36:12 PDT 2014