Sync'd branch projects/oak with upstream @ Fri Sep 19 15:57:14 PDT 2014