Sync'd branch projects/pine with upstream @ Tue Sep 30 19:05:15 PDT 2014