Sync'd branch projects/pine with upstream @ Wed Oct  1 18:26:16 PDT 2014