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