Sync'd branch projects/pine with upstream @ Thu Aug 28 15:06:10 PDT 2014