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