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