Sync'd branch projects/pine with upstream @ Mon Oct 27 11:37:19 PDT 2014