Sync'd branch projects/oak with upstream @ Mon Sep 22 03:03:12 PDT 2014