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