Sync'd branch projects/pine with upstream @ Thu Oct 23 15:45:18 PDT 2014