Sync'd branch projects/oak with upstream @ Tue Sep 23 02:31:13 PDT 2014