Sync'd branch projects/pine with upstream @ Wed Aug 27 13:22:12 PDT 2014