Sync'd branch projects/pine with upstream @ Thu Sep 25 12:01:14 PDT 2014