Sync'd branch projects/oak with upstream @ Fri Oct  3 13:59:14 PDT 2014