Sync'd branch projects/oak with upstream @ Tue Sep  2 18:25:08 PDT 2014