Sync'd branch projects/oak with upstream @ Mon Sep 22 11:50:13 PDT 2014