Sync'd branch projects/pine with upstream @ Tue Sep 16 04:57:12 PDT 2014