Sync'd branch projects/oak with upstream @ Mon Sep 22 09:56:15 PDT 2014