Sync'd branch projects/oak with upstream @ Fri Sep 12 13:11:26 PDT 2014