Sync'd branch projects/oak with upstream @ Fri Sep 26 09:55:53 PDT 2014